Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 15 Feb 2012 18:04:22 +0000 (10:04 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 15 Feb 2012 18:04:22 +0000 (10:04 -0800)

Trivial merge